234. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:03 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

234.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Checkout/web/template/minicartcontent.html2016-06-21 09:41:12 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Checkout/web/template/minicartcontent.html2021-05-04 09:53:14 +0000

234.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged11162
Changed457
Inserted310
Removed314

234.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

234.4 Active regular expressions

No regular expressions were active.

234.5 Comparison detail

1 <!-- 1 <!--
2 /** 2 /**
3  * Copyright © 2016 Magento. All rights reserved. 3  * Copyright © 2016 Magento. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  */ 5  */
6 --> 6 -->
7 <div class="block-title"> 7 <div class="block-title">
8     <strong> 8     <strong>
9         <span class="text"><!-- ko i18n: 'My Cart' --><!-- /ko --></span> 9         <span class="text"><!-- ko i18n: 'My Cart' --><!-- /ko --></span>
10         <span 10         <span
11             class="qty empty" 11             class="qty empty"
12             data-bind="css: { empty: !!getCartParam('summary_count') == false }, 12             data-bind="css: { empty: !!getCartParam('summary_count') == false },
13                        attr: { title: $t('Items in Cart') }"> 13                        attr: { title: $t('Items in Cart') }">
14             <!-- ko text: getCartParam('summary_count') --><!-- /ko --> 14             <!-- ko text: getCartParam('summary_count') --><!-- /ko -->
15         </span> 15         </span>
16     </strong> 16     </strong>
17 </div> 17 </div>
18  18 
19 <div class="block-content"> 19 <div class="block-content">
20     <button type="button" 20   <button type="button"
21             id="btn-minicart-close" 21           id="btn-minicart-close"
22             class="action close" 22           class="action close"
23             data-action="close" 23           data-action="close"
24             data-bind="attr: { title: $t('Close') }"> 24           data-bind="
25         <span><!-- ko i18n: 'Close' --><!-- /ko --></span> 25               attr: {
    26                   
title: $t('Close')
    27               },
    28               click: closeMinicart()
    29           ">
    30       <span translate="'Close'"/>
26     </button> 31   </button>
27  32 
28     <!-- ko if: getCartParam('summary_count') --> 33   <!-- ko if: getCartParam('summary_count') -->
    34     <div class="total-count text-v-dark">
29         <div class="items-total"> 35       <div class="items-total">
30             <span class="count"><!-- ko text: getCartParam('summary_count') --><!-- /ko --></span> 36           <span class="count"><!-- ko text: getCartParam('summary_count') --><!-- /ko --></span>
31             <!-- ko if: getCartParam('summary_count') == 1 --> 37           <!-- ko if: getCartParam('summary_count') == 1 -->
32                 <!-- ko i18n: 'item' --><!-- /ko --> 38               <!-- ko i18n: 'item' --><!-- /ko -->
33             <!-- /ko --> 39           <!-- /ko -->
34             <!-- ko if: getCartParam('summary_count') > 1 --> 40           <!-- ko if: getCartParam('summary_count') > 1 -->
35                 <!-- ko i18n: 'items' --><!-- /ko --> 41               <!-- ko i18n: 'items' --><!-- /ko -->
36             <!-- /ko --> 42           <!-- /ko -->
37         </div> 43       </div>
38     
39         <!-- ko if: getCartParam('possible_onepage_checkout') -->    
40             <!-- ko foreach: getRegion('subtotalContainer') -->    
41                 <!-- ko template: getTemplate() --><!-- /ko -->    
42             <!-- /ko -->    
43         <!-- /ko -->    
44     
45         <!-- ko foreach: getRegion('extraInfo') -->    
46             <!-- ko template: getTemplate() --><!-- /ko -->    
47         <!-- /ko -->    
48     
49         <!-- ko if: getCartParam('possible_onepage_checkout') -->    
50         <div class="actions"> 44       <div class="actions">
51             <div class="primary"> 45           <div class="secondary">
52                 <button 46               <a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}">
53                         id="top-cart-btn-checkout" 47                   <span translate="'View Cart'"/>
54                         type="button" 48               </a>
55                         class="action primary checkout" 49           </div>
56                         data-bind="attr: {title: $t('Go to Checkout')}">    
57                     <!-- ko i18n: 'Go to Checkout' --><!-- /ko -->    
58                 </button>    
59                 <div data-bind="html: getCartParam('extra_actions')"></div>    
60             </div> 50       </div>
61         </div> 51     </div>
    52       <!-- ko foreach: getRegion('extraInfo') -->
    53           <!-- ko template: getTemplate() --><!-- /ko -->
62         <!-- /ko --> 54       <!-- /ko -->
63     <!-- /ko --> 55   <!-- /ko -->
64  56 
65     <!-- ko if: getCartParam('summary_count') --> 57   <!-- ko if: getCartParam('summary_count') -->
66     <strong class="subtitle"><!-- ko i18n: 'Recently added item(s)' --><!-- /ko --></strong> 58   <strong class="subtitle"><!-- ko i18n: 'Recently added item(s)' --><!-- /ko --></strong>
67     <div data-action="scroll" class="minicart-items-wrapper"> 59   <div data-action="scroll" class="minicart-items-wrapper">
68         <ol id="mini-cart" class="minicart-items" data-bind="foreach: { data: getCartParam('items'), as: 'item' }"> 60       <ol id="mini-cart" class="minicart-items" data-bind="foreach: { data: getCartParam('items'), as: 'item' }">
69             <!-- ko foreach: $parent.getRegion($parent.getItemRenderer(item.product_type)) --> 61           <!-- ko foreach: $parent.getRegion($parent.getItemRenderer(item.product_type)) -->
70                 <!-- ko template: {name: getTemplate(), data: item, afterRender: function() {$parents[1].initSidebar()}} --><!-- /ko --> 62               <!-- ko template: {name: getTemplate(), data: item, afterRender: function() {$parents[1].initSidebar()}} --><!-- /ko -->
71             <!-- /ko --> 63           <!-- /ko -->
72         </ol> 64       </ol>
73     </div> 65   </div>
74     <!-- /ko --> 66   <!-- /ko -->
75  67 
76     <!-- ko ifnot: getCartParam('summary_count') --> 68   <!-- ko ifnot: getCartParam('summary_count') -->
77         <strong class="subtitle empty" data-bind="visible: closeSidebar()"
>		 69     <div class="total-count text-v-dark">
    70       <div class="items-total">
    71           <span class="count">0</span>
    72           <span class="counter-label" translate="'Item'"/>
    73       </div>
    74       <div class="actions">
    75           <div class="secondary">
    76               <a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}">
    77                   <span translate="'View Cart'"/>
    78               </a>
    79           </div>
    80       </div>
    81     </div>
    82     <strong class="subtitle empty" data-bind="visible: closeSidebar()" translate="'You have no items in your shopping cart.'">
78             <!-- ko i18n: 'You have no items in your shopping cart.' --><!-- /ko --> 83         <!-- ko i18n: 'You have no items in your shopping cart.' --><!-- /ko -->
79         </strong> 84     </strong>
80         <!-- ko if: getCartParam('cart_empty_message') --> 85     <!-- ko if: getCartParam('cart_empty_message') -->
81             <p class="minicart empty text"><!-- ko text: getCartParam('cart_empty_message') --><!-- /ko --></p> 86         <p class="minicart empty text"><!-- ko text: getCartParam('cart_empty_message') --><!-- /ko --></p>
82  87 
83             <div class="actions"> 88         <div class="actions">
84                 <div class="secondary"> 89             <div class="secondary">
85                     <a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}"> 90                 <a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}">
86                         <span><!-- ko text: $t('View and edit cart') --><!-- /ko --></span> 91                     <span><!-- ko text: $t('View and edit cart') --><!-- /ko --></span>
87                     </a> 92                 </a>
88                 </div> 93             </div>
89             </div> 94         </div>
90         <!-- /ko --> 95     <!-- /ko -->
91     <!-- /ko --> 96   <!-- /ko -->
92     
93     <!-- ko if: getCartParam('summary_count') --> 97   <!-- ko if: getCartParam('summary_count') -->
    98     <!-- ko if: getCartParam('possible_onepage_checkout') -->
    99         <!-- ko foreach: getRegion('subtotalContainer') -->
    100             <!-- ko template: getTemplate() --><!-- /ko -->
    101         <!-- /ko -->
    102     <!-- /ko -->
    103   <!-- /ko -->
    104   <!-- ko if: getCartParam('possible_onepage_checkout') -->
94     <div class="actions"> 105   <div class="actions">
95         <div class="secondary"> 106     <div class="primary">
96             <a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}"> 107         <button
97                 <span><!-- ko i18n: 'View and edit cart' --><!-- /ko --></span> 108                 id="top-cart-btn-checkout"
98             </a> 109                 type="button"
    110                 class="action primary checkout"
    111                 data-action="close"
    112                 data-bind="
    113                     attr: {
    114                         title: $t('Go to Checkout')
    115                     },
    116                     click: closeMinicart()
    117                 "
    118                 translate="'Go to Checkout'"
    119         
/
>
    120         <div data-bind="html: getCartParam('extra_actions')"></div>
99         </div> 121     </div>
100     </div> 122   </div>
101     <!-- /ko --> 123   <!-- /ko -->
102     
103     <div id="minicart-widgets" class="minicart-widgets"> 124   <div id="minicart-widgets" class="minicart-widgets">
104         <!-- ko foreach: getRegion('promotion') --> 125       <!-- ko foreach: getRegion('promotion') -->
105             <!-- ko template: getTemplate() --><!-- /ko --> 126           <!-- ko template: getTemplate() --><!-- /ko -->
106         <!-- /ko --> 127       <!-- /ko -->
107     </div> 128   </div>
108 </div> 129 </div>
109 <!-- ko foreach: getRegion('sign-in-popup') --> 130 <!-- ko foreach: getRegion('sign-in-popup') -->
110 <!-- ko template: getTemplate() --><!-- /ko --> 131 <!-- ko template: getTemplate() --><!-- /ko -->
111 <!-- /ko --> 132 <!-- /ko -->

Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.